Use "vcpu" when referring to vcpus.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index ba588146eaccdba2b4b29b31311b867768cef0bb..5cf5fda6bece124f137aff454fec557431f27054 100644 (file)
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -155,7 +155,7 @@ class XendDomain:
         if not dom0:
             dom0 = self.domain_unknown(0)
         dom0.dom0_init_store()    
-        dom0.dom0_enforce_cpus()
+        dom0.dom0_enforce_vcpus()
 
     def close(self):
         pass

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 40f822afd89bc034d3992882d80540a498d486c5..5c26e113753450916a99dc30734b4f8cd5bc8866 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -1120,13 +1120,13 @@ class XendDomainInfo:
             # get run-time value of vcpus and update store
             self.configure_vcpus(dom_get(self.domid)['vcpus'])
 
-    def dom0_enforce_cpus(self):
+    def dom0_enforce_vcpus(self):
         dom = 0
-        # get max number of cpus to use for dom0 from config
+        # get max number of vcpus to use for dom0 from config
         from xen.xend import XendRoot
         xroot = XendRoot.instance()
-        target = int(xroot.get_dom0_cpus())
-        log.debug("number of cpus to use is %d" % (target))
+        target = int(xroot.get_dom0_vcpus())
+        log.debug("number of vcpus to use is %d" % (target))
    
         # target = 0 means use all processors
         if target > 0:

diff --git a/tools/python/xen/xend/XendRoot.py b/tools/python/xen/xend/XendRoot.py
index 279dd146222fe7f3340111030842305a4de96ce4..2306f0d31fe2e88898e57d6e8d3e5bbb3fa3a394 100644 (file)
--- a/tools/python/xen/xend/XendRoot.py
+++ b/tools/python/xen/xend/XendRoot.py
@@ -87,7 +87,7 @@ class XendRoot:
 
     dom0_min_mem_default = '0'
 
-    dom0_cpus_default = '0'
+    dom0_vcpus_default = '0'
 
     components = {}
 
@@ -332,8 +332,8 @@ class XendRoot:
     def get_dom0_min_mem(self):
         return self.get_config_int('dom0-min-mem', self.dom0_min_mem_default)
 
-    def get_dom0_cpus(self):
-        return self.get_config_int('dom0-cpus', self.dom0_cpus_default)
+    def get_dom0_vcpus(self):
+        return self.get_config_int('dom0-cpus', self.dom0_vcpus_default)
 
 def instance():
     """Get an instance of XendRoot.